DOC-1153: Still more and more edits of this neverending saga.