Update fork from bolt/bolt/feature/bolt2