Merge tag '2.1.1' into develop

2.1.1
Avoid generated directories being cleaned up after generation
Bump version number and update release notes
Merge branch 'release/2.1.2'