Backported patch 4118