BIGTOP-1395. Simplifying non-component versions evaluation