Merge "Fix off-by-one error in historical app ops."