Merge branch 'master' into UI_wip2
Merge branch 'master' into UI_wip2
Merge branch 'master' into UI_wip2
Fix conflict on 'create' view
Merge branch 'UI_wip2'