Merge "Prepare for 6.1.0"