Merge master commit 'ac528e6a2300b092ad285339bf0c002b030c3be2' into framework
fix ORM связи RELATION_TYPE_HAS_ONE
Merge commit '756077d9877cc57245f968b6c1f29e755cca36e9' into framework
merge