@DamienMcKenna, Please review the re-rolled patch. If you feel this is okay t...