Merge "Change the triggering criteria for blocking helper" into pi-dev