manually merge from newpage branch