Pr/6331

Replaces #6331