Merged Forstride's BlockBOPFlower changes