Update feature.xml
Update pom.xml
Merge remote-tracking branch 'origin/3.3.x' into sns