BZ 1070326, PullRequest 26 : feedback requested