Merge "followup: Include spec/discussion references"