Let's get code pushed from https://github.com/djsagar/corporateclean to 8.x-1...