Merge pull request #16147 from tiborvass/refactor-builder

Refactor builder with new Go interfaces