Merge "Move PersistentDataBlock* in server to its namespace" into main