Additional changes in 'Double type for rotation' commit