Merge "Fix error in various deprecated selectFields() methods"