Merge "Inline/remove unnecessary instance fields from PM." into main