ac5569929d
Also save page index (cherry picked from commit af0fdfa3b7e859db54154473a8cd4c7b50121ca7)
Also save page index (cherry picked from commit af0fdfa3b7e859db54154473a8cd4c7b50121ca7)