Merge pull request #330 from tmorgner/master

PRD-4984 - Fixing datasource behaviour when editing multiple queries
Merge pull request #334 from tmorgner/master

PRD-4898 and PRD-4909