[finkelsc] Merge