1/l6h part 1
Merge pull request #776 from abhinavc/master

1/l6h part 1