- merge review: remove comment causing doxygen to emit non-utf output (#226377) - other minor spec cleanups