merging stable into production