MPS-21077 Cannot resolve conflicts in order to merge 3.2/vaclavFixes into master