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

This reverts commit 468ca3cfe6278b7c38d2a41478ca43acdb2ec97a.
Rebase from 'upstream' @ version '1.10.0'
Trimmed the branch to only the image_common sub directory