WS-1268 WS-1219 WS-1347 Header image refactoring, S3 issues