#1335 spec stabilization