finish-hotfix

Complete and merge hotfix branch