Merge fixes for develop