Merge topic 'minor-refactoring' 8c066045ec Source: Improve some code readability and efficiency f64a774b49 Source: Reuse some existing variable declarations Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8492