Merging all SBT feature requests together