am 0d5de134: am 5ac62d69: Merge "Fix overlapping pages (issue 12551580)" into jb-ub-now-kermit

* commit '0d5de134258f71269a2d3b846521544bbad2a2eb':
  Fix overlapping pages (issue 12551580)