PR #686 - utkarshdalal/GameNative