Rebase blocks/Cinder-KCB