Merge "Extract an "ArrayMapWithHistory" support class"