Merge branch '24616-mr-shows-the-build-for-this-merge-request-failed-although-builds-still-running' into 'master'

Resolve "MR shows "The build for this merge request failed" although builds still running"

Closes #24616

See merge request !7579