Retrieving code lost in merge
Merge branch 'next' into vault