Cherry-pick HalfBlock Implementation fix.