Making it functionally and conceptually similar to master branch.