change cronjobcontroller
Merge origin/master