Merge pull request #2649 from castillofrancodamian/pagekitec