Merge "[pm] minor refactoring"