add conformance test
Merge commit '628e03e00bdcedc525a85978e8ab129b79fb9766' into dev