Exchange bootstrap reenabled
Merge branch 'master' into fix_OOIION904
Fix OOIION-904: Reenabled exchange bootstrap