Merge pull request #17871 from seamuslee001/deprecated_jquery