Replaces #5324