=con #3975 Check for wrong id in cluster sharding (forward port)

* Also, a watch leftover from ticket 3882

(cherry picked from commit cbc9dc535c0692a7df00bfb7292e62de1bed7e3f)