Revert "Trimmed the branch to only the image_rotate sub directory"

This reverts commit 1a12b3d91f218ba676c65285e3f423ebed4338b7.
Rebase from 'upstream' @ version '1.10.1'
Trimmed the branch to only the image_rotate sub directory