Image set for Manza and Neff
Merge branch 'origin/master'