Merge branch 'feature/komodo-toolbox'
Merge branch 'feature/komodo-toolbox'
tidy build file