small updates
Merge remote-tracking branch 'origin/feature-cam-473-trust-own-keys' into feature-cam-473-trust-own-keys
Merge remote-tracking branch 'origin/feature-cam-473-trust-own-keys' into feature-cam-473-trust-own-keys