The PDBs have been a recurring pain point with the previous implementation so we should backport to 4.6.z
Cloned incorrectly...