Merge pull request #8933 from ejegg/mergeNotices