Merge branch 'v1' into feature/user_vars