Merge pull request #8725 from nxhack/bump_8_16_0