Fixed a problem with a non-existent page after removing the product
Merge branch 'develop' into new-ui-release