Issue #3399