Task/1819 merge feature files related to forms