Misc changes
minor #4695 Misc changes (ifdattic)

This PR was squashed before being merged into the 2.3 branch (closes #4695).

Discussion
----------

Misc changes

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | 2.3
| Fixed tickets |

Commits
-------

18fa2c6 Misc changes