imported patch 945945-follow1.patch