backporting to 1-1-stable