Assets controller fixes
Merge pull request #3133 from benmccann/2.3.x-assets-3

Backport to 2.3.x: Assets controller fixes