Merge remote-tracking branch 'alfh/feature_firewalllog_first_last' into next