Merge branch 'revert-02b2cc16' into 'master'
What does this MR do and why?
Describe in detail what your merge request does and why.
Picking !101492 (merged) to resolve test failures on the 15-5 RC
Related #378381 (closed)
Edited by Arturo Herrero