2.1.17

This commit should be the last one. Can be used in test environment.
Last corrections:
* 302
* 307