Thanks for this patch! Although the line numbers changed a bit, I was able to manually apply the patch to version 8.x-1.3.
Big +1 for merging this very simple and useful feature!
djmolny → created an issue.