Cherry-picks bug fixes into '15-5-stable-ee'

What does this MR do and why?

Cherry-picks !104913 (merged) into 15-5-stable-ee

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

• [-] I have evaluated the MR acceptance checklist for this MR.