lattera Merge remote-tracking branch 'origin/hardened/current/master' into ha… …