Merge branch 'dev' into authenticate
a