Merge branch 'dev' for v1.5 release