Merge Tulba changes