Pre-merger commit