Merge branch 'rename_loglevel_option' into release-3.16

Merge-request: !3899