Merge coron-4.2 into coron-4.1