Merge "Properly name static member var"