Commenting some modules for migration to 7.18