merge from tachyon master