Merge "Support metadata encryption"