Bug 3433: fixing frontend tools to work in master branch