Update bs2 compatible
clean up
Merge branch 't3b3' of github.com:t3framework/t3 into t3b3