updated: aligned with upstream.
updated: spec bump.