Spec updates

+review REVIEW-5081