merge improvements
Merge branch 'hotfix/2.7.1' of ssh://172.20.0.1/var/git/espo/backend into hotfix/2.7.1
Merge remote-tracking branch 'origin/hotfix/2.7.1' into hotfix/2.7.1
Merge branch 'hotfix/2.7.1'