Merge "Greylist cloned SDK fields" into pi-dev