Merge "[pm] dump per user dataDir" into main