(COMMIT-53) CommonController modifications