Merge pull request #7660 from cdce8p/release-2.15.5

Release 2.15.5