Changes related to prod issue