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

This reverts commit 398ed6f773208a10ad6f4e8105bd2429fab9e724.
Rebase from 'upstream' @ version '1.10.4'
Trimmed the branch to only the image_rotate sub directory