Getting sufia spec fixes from the release branch