Merge release

[Delivers #55254216]

* release-1.2.1:
  Add in missing spec
  Eliminate the unnecessary base branch
  Bump version number