Merge "Barrier turn on/off - PacketOut bypass" into stable/lithium