Help block is showing for hidden field
Spec for #2003
Merge remote-tracking branch 'upstream/pr/2003'