Merge from bolt/bolt