Merge branch 'remember-page' into next