+ refactorings to alter the order of watch callback for 'null' key, which aligns with the watch callback for non null
Merge remote-tracking branch 'origin/cluster3' into cluster3