merge sbJFn5r additions