Merge "toolbox: fix build"