Merge branch 'hotfix/#6573-zend-cache-filesystem-race-conditions-fixes-for-#6435'

Close #6573
Close #6435
Run CS checks _AFTER_ real unit tests
Merge branch 'hotfix/run-cs-fixes-after-real-tests' into develop