Merge branch 'master' into release
Start only one cleanup process, when soft limit is reached
Merge branch 'release'