Long-running operation fix
Merge pull request #2041 from jeffwilcox/release-rt-fix

Long-running operation fix