Merge "Fixing two regressions in which side pages were not drawn or oriented correctly."