Merge "Reduce the overhead of historical appops"