PR #1306 - utkarshdalal/GameNative