Merge v2.0.4 into v2.1

This commit merges everything from v2.0.4-dev (and therefore v2.0.3) into the v2.1-dev branch.
We can then start building on top of this to continue the work for v2.1.