Manually backported following changes: RM-4293 734c1b2a82 RM-4326 a4aac053a8 c6ca74ab26
734c1b2a82
a4aac053a8
c6ca74ab26