UI Product VM fix.
Merge branch 'dev'