Reintegrate last commit from master into this new develop branch (started at 5.2.0)

Develop branch