Merge "Make historical op getters async for real"