Merge "Revert^4 "[pm] remove circular dependency in init helper"" into tm-dev