Merge branch 'dev' into jas1.6port1.5