small changes
merged branch bamarni/minor-2.1 (PR #7533)

This PR was merged into the 2.1 branch.

Discussion
----------

small changes

Commits
-------

766e880 small changes