Merge "Prepare for Clover 6.1.0"