Fix is available in the provided patch.
Kevin.- → created an issue.
Re-rolled patch in #24 against 8.x-1.4.