Connect to bootstrap after the callbacks have been registered
Merge remote-tracking branch 'antox/master'