Issue #499 fixed
Merge remote-tracking branch 'upstream/development' into development
Issue #416 done. Migrations regenerated.
Merge pull request #505 from Bohdan-Tereta/development

Issue #499 fixed