Update Product Packages (line #60+)
Merge branch 'jb-mr1-wip' into jb-mr1