Merge "Fix case of various newFromID/newFromId functions"