Merge "Update apiref"