Feature #2368 - adding support for form helpers