Merge pull request #10936 from BruceForstall/TempRegApi