Merge from branches/werdna/restrictions-separation (forked at r18959): * Branch page_...