Replace #621Fixed race condition between operation cancelation and loading finish
Merge pull request #783 from bpoplauschi/race_condition

Replace #621Fixed race condition between operation cancelation and loading finish