GamePlay v1.7.0 - merged master to next

GamePlay v1.7.0 - merged next to master