GamePlay v1.7.0 - merged next to master