Merge "Fix deadlock when ParallelPackageParserCallback is used" into pi-dev