Merge back recent hot fixes to develop