Bug 828955 - helper design is messed up
Merge pull request #7497 from pivanov/bug-828955

Bug 828955 - helper design is messed up