Merge branch 'dev' into gs_master