Merge "Introduce the concept of ProductAwareBuilder"