Merge branch 'embeds'
Fix for json import not working due to invalid library name
Merge branch 'hotfix-json-import' into staging