MC1.5.2 changes from MC1.6.2