Update "Add/edit product" screen with latest changes
Merge branch