PR #1081 - utkarshdalal/GameNative