Merge "[Regression] Delete autoblocks when removing autoblock flag"