Merge branch 'f-assetmanager' into develop