Merge "Specification change"