420.17 Issue76 branch - Interim checking - Code review and cleanup before merge with dev branch