Add feedback fix
Merge branch 'cm' of https://github.com/luk1337/build_tools into cm