Fixes #5172 Should be code complete