Merge pull request #12834 from pradpnayak/preRelHook