Merge branch 'release/v2.1.0' into develop

* release/v2.1.0:
  Bump to version v2.1.0.
Be compatible with previous configuration format.
Bump version to 2.1.1
Be compatible with previous configuration format.

* release/v2.1.1:
  Bump version to 2.1.1
  Be compatible with previous configuration format.