Update from bolt:master