[FOLD/8eb0f4b4] Address comments