[#59491252 #60153966] simplified the cron task
Merge branch 'hotfix-0.3.2' into develop