Merged Bill Heaton's PR into mine where I can PR against the main repo's assetmanager branch