Merge "Mitigating cache corruption in ArrayMap" into pi-dev