Merge branch 'master' into development
Updated support for https on fact create
Merge branch 'development'