HR-316 - Add generic form regions