Upgraded to Bolt 1.6.9.
Merge branch 'upgrade_bolt' into develop