Merge branch 'CoreProduct'
updated master to 6.2.0-SNAPSHOT