prevent deadlock at runtime startup
Merge remote-tracking branch 'origin/master'