Merge pull request #87 from Fraser999/MAID-567

Maid 567
Merge remote-tracking branch 'upstream/next' into routing_v2