(D3 factor graph tweaks)
Merge remote-tracking branch 'origin/dev' into dev