case 2828 - Expanding scope of ENTER blocking.
Merge remote-tracking branch 'origin/case-2828' into develop