merge branch MultiPageView