MPS-20272 - merged, resolved conflicts and rebuilt
Merge branch '3.2/vaclavConsoleHelpMerge'