Merge pull request #1010 from blackberry/next

GamePlay v1.7.0 - merged next to master
Merge pull request #1017 from seanpaultaylor/master

GamePlay v1.7.0 - merged master to next