Updates for Pageimage suffix support per @horst-n PR #528