This commits include required changes to manage product version based on what we talked with DiegoM today