Merge pull request #7708 from daverodgman/sha3-updated