Merge pull request #300 from bhariharan/unstable20

Fix VFConnector tests
Latest shared
Merge pull request #301 from wmathurin/unstable20

Latest shared
Fix crash in dialog