Merge "Add butter bar when blocking is suppressed." into nyc-dev