Merge "RELEASE-NOTES-1.32: Some cleanup"