Fixing bug with trusted_hosts
Displaying browser trigger archiving status when the feature has been disabled
Merge remote-tracking branch 'origin/master'