Merge from vtyulb