PR #682 - utkarshdalal/GameNative