Update hotfixes from master