Merge "Display proper block text for blocking helper"