Merge branch 'develop' into fedora-install