Merging all changes to prod core