Merge from bas-t