Merge: Force standard as public