Merge pull request #15863 from seamuslee001/status_bounce_extension