Creedence CP-5095

As requested by @stephen-turner