Update specs related to #733 and #827