changes to defconfig and makefile not added due to github issues