Last commit before PR

Code changes address these feature requests:
[SeeRM #8737]
[SeeRM #8752]
[SeeRM #8755]