As mentioned in Issue #1996