Forwardported #557