am 21342d1a: Merge "Add missing finals, small doc tidying."

* commit '21342d1aa69b37f1a51a5a0ead0676051ee926f1':
  Add missing finals, small doc tidying.