Backport to 2.3.x: Assets controller fixes