issue #5124