Dynamic Packet Handler and more mapping work.
Merge remote-tracking branch 'origin/1.7' into 1.7