Merge pull request #311087 from AwesomeQubic/update-sherlock