Merge "Fix OOF configuration for connectivity"