Merge "Fix high traffic PMS lockless methods" into tm-dev