3.6/news merge with 3.6 dev

Merging 3.6 dev into 3.6/new merge after changes to how image assets are handled