Taken into account Duncan's comments for r149481 dated by 2nd Feb 2012: