Merge branch '2021.2.0' into '2021.2'

2021.2.0 > 2021.2

See merge request xrm/basic!1365

preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod

@@ -5,7 +5,6 @@
   <customized />
   <mailGlobalUserServerEnabled v="true" />
   <projectName>ADITO xRM</projectName>
-  <defaultDataAlias>Data_alias</defaultDataAlias>
   <jditoMaxContentSize v="57671680" />
   <mailEnableUserDefault v="true" />
   <mailDefaultMailserver>mailServerIMAP</mailDefaultMailserver>