Merge "Enable moving classes."