Merge "[pm] app data helper"