Merge dev-2.0.4 into wip/v2.1.0-copy