Fixing merge (duplicated case)
Merge remote-tracking branch 'origin/devel-0.5' into msune/devel-0.5/packet_hdrs_template