QD-50 : merged in two patches/pull requests, made more changes, fixed the tests
Merge pull request #2 from indeedeng/jira/QD-50-2

QD-50 : merged in two patches/pull requests, made more changes, fixed the tests