Merge "ART: Fix test 912" into oc-dev