Merge "SO-3720 BuildingBlockRollback lookup table"