Merge branch '708-dpid-and-aeid-command-line-options-robustness' into 730-directivity-pattern-id-not-set-correctly