Merge "Barrier turn on/off - Split OutboundQueueManager" into stable/lithium