Cherry pick for critical fixes

[RJA-2342], [RJA-2372]