merged in settings updates from master