Merge relevant changes in 'Form'

_Check out mail_, so as to carry on with the writing and polishing of FEECa.
Merge changes in implementation and/or documentation into the main branch (when ready and tested).
