Merge changes from bolt/bolt