Merge branch 'release/1.4.0' into develop
Upgrade work with generic relations
Update version
Merge branch 'release/1.5.0'