Fix cherry-picking conflicts
Merge pull request #2485 from Conceptual-Design/RC0.7.2_master

Fix cherry-picking conflicts