merge BoostCake commits