Merge "[CPS] Log4j fix" into istanbul