Merge "Remediate log4shell vulnerability"