Merge branch 'exoscalefix' into 4.3