MDL-13638 Merged from stable