Merge branch VA-ISOC-conformance