- Integrated some code from the (soon to be obsolete) 2.0.0 branch, which is general in nature and will be needed. - And the corresponding unit tests.