[MERGE] Merge from customer repository