Manually backported following changes: RM-4293 135c4e04e0 RM-4326 fce705ff72 0836e9682b
135c4e04e0
fce705ff72
0836e9682b