Merging hot fixes back to master.