Merge "Reducing the size of some ms"