Fixed merge error, ready for comment spinner pull request
Fixed merge error, ready for comment spinner pull request


Former-commit-id: 843f037a54d6bae12180593bef7e39ff9a23b89d
bsloane1650/HNES,bsloane1650/HNES