Merging bugfixes and selective cronjob in stable