Merge "APEX: iso verify fixes"