Merge branch 'master' into LOG4J2-1121B-ReliabilityStrategy