Merge remote-tracking branch 'refs/remotes/github/sb4' into sb4
rewrite base for extensions part 1
rewrite base for extensions part 2
removed lots of ;