Backport of daniel_755 to v1.11.x