Merge "Fix ApexCompressionTests" into main