Fix bug and clarify variable name
Merge branch 'develop' into release/4.6