(ITS#6608) ppolicy internal modifications break replication