MX-1233, MX-1240, address some CR comments