Testing #4009 from a different branch