Issue 3404

@phtaylor