Merge amo fix to prod as well