Merge "Distinguish between unencrypted and unencryptable" into nyc-dev