Initial commit with base code from gazelle master branch.