Import and upgrade patch from pull request #603
Merge pull request #709 from Gozala/bug/page-mod@800240

Import and upgrade patch from pull request #603 a=@gozala