Merge in hotfixes from dev