Changes from bas-t master