Re #6366 correct data path