Merge "[PT17] Small cleanup of PacManager"