Merge "Cleanup and refactoring." into graphics-dev