Bugzilla #42971 and #42956 AFP Renderer Improvements Submitted by Adrian Cumiskey <dev.at.cumiskey.com>