Create new, clean copy of Wip/v2.1.0