Merge branch 'dev' into master - Release 1.0.16