PR #437 - utkarshdalal/GameNative