make it metavalue-tolerant.
Merge branch 'metavalue-tolerance'