Merge in changes from HotFix into master