Merge "Add @since to new variables, fix variable name"