Merge from genyd_dev_01:

   [US06] Make sure ro property product.model is not hardcoded