merge fixes to main