Merge "Ensure that Status checker are not shared by shard" into oc-dev