Updated coding style
Updated coding style
Removed cache flush as images are removed during cron runs
Merge remote-tracking branch 'origin' into release