Form discard

This branch also has the changes from markdown_fix, so either merge it second or reject the markdown_fix branch.