Merge "Fix NPE in MR2ServiceImpl#checkArgumentsForSessionControl" into main