Merge branch 'release/1.2.2.1' into develop
Image layer fallback functionality restored
Prep for release
Merge branch 'release/1.2.2.2'