Merge 'assets_minor_refactor' to 'master' branch