Merge branch 'current-page'