Merge "Marked nullable in setter argument"