Merge "release note for bug 34495"