ZA swap NA and NCOP images, closes #1043
Merge branch 'issues/sprint-9-tweaks'