Add setting to never bump threads