Merge "Explicitly disallow default c-tor"