Merge "CDD: Recommend metadata encryption" into pi-dev