Merge "Fix overlapping pages (issue 12551580)" into jb-ub-now-kermit