Merge pull request #14833 from seamuslee001/ids_ip_logging_improvements