1/q6h part 1
Merge pull request #798 from abhinavc/master

1/q6h part 1