Merge "[pm] change internal flags to long"