Main merge

Main merge (customers)