Roll-out part of revision 253275 related to rotation handling