merged changes from Trinity repo, updated defconfig