update cam-473-trust-own-keys
Merged 'dev'.