Rotation, scale, resize and interpolation merged from manual branch