Merge "[pm] feature flag for nullable dataDir" into main