Same as f39cb2b except backport friendly

Point release notes to stable branch for list of commits. [ci skip]