Merge PDlogs changes to release-56