Multiple metadata selection fixes
Merge branch 'victor.klymenko' into develop
Fixed tests pom