Datastore revamp 4: sunset MsgId
#1785
+460
−443
Merged
MsgId
#1785