Change ordering of initialization to prevent blocking
Merge remote-tracking branch 'origin/master'