Change Details

blocking depending on config option, so we can first mark as blocked, and only start blocking in a second step.