Merge branch 'release/2.1.1' into develop
[BUGFIX] Allow
[UPDATE] Bump to 2.1.2
Merge branch 'release/2.1.2'