distributors - updated tupane changes from master