PIM-971 : Fix form type due to merge with master