TMDM-7771 Move "key" condition from Criteria to new property.
Merge branch 'maintenance/5.6'