#824 - Move the page template path override logic