pre vbranch merge file removals
pre merge deletions
add changes to parser
merge with master branch
pre merge commit
merged
adds form definitions for regular types in parseList()