Oldgd

There were too many commits to cherry pick one by one. I created a fresh 'orphan' branch, pulled your branch and just added the changed files. Is it alright?