add conformance from db
Merge commit '554a45dfca926d791bc72bfd4f8f304670dbdc6a' into dev