[WIP] v2 #11

Draft
ashpie wants to merge 5 commits from v2 into develop

5 Commits