Merge branch 'develop' into 'develop_2.1.1'

# Conflicts:
#   README.md
5 jobs for develop_2.1.1 in 0 seconds (queued for 8 seconds)
latest