Merge v4.1.1 changes to develop
Some minor changes were done to the v4.1.1 release branch that still need to be merged with develop; that is done in this merge request.
Some minor changes were done to the v4.1.1 release branch that still need to be merged with develop; that is done in this merge request.