Merge "Revert "When aborting EnhancedRC block line, block should reflect that""