Merge branch 'hotfix/m_date_fix'
speed improvement
Merge branch 'hotfix/speed_1' into develop