Merge "Revert "Add modules partition""