add feature valcan
Merge branch 'feature-vulcan' into dev