Merge "Update log4j version due to security vulnerability for CPS"