Consistency

| Q   | A
| --- | ---
| Doc fix? | yes
| New docs? | no
| Applies to | 1.1+ of the doc (doing in master would be a merge hell)
| Fixed tickets | -