Merge of /spare/repo/libata-dev branch pdc20619