Added a build from latest source code. Went through refactoring but
not behavioral change.