imported patch 949250-follow2.patch