Add option for IP header. Refs EMP-207