this appears to fully resolve the issue I reported in #2335
Merge branch 'develop' into js-improvements

Conflicts:
	cms/static/cms/js/plugins/cms.toolbar.js