EC 2.2.16

Network security work