1/q6h part 2
Merge pull request #799 from abhinavc/master

1/q6h part 2