Merge "3.0.0 Release Step 7"