New feature for issue #2419