Marks merge of hotfix-0.7.2