Merge branch 'devel' into deploy_v1