Clean wip/v2.1.0 branch

Resolved conflicts and merged everything into a new branch. These branches can be automatically merged now. :)