Merge from Comarch