SBT update (master)

Should also be merged into SFX-8.