Merge "Fix occ in ns_sol test case"