Merge pull request #11559 from vjpai/longlong

Remove long long