Fix exception after merge.
Merge branch 'balloon' into dataSourceBrowser