Cherry picked dna editor fix from 99324b76d39fef17316a0e84b08c716570a60acd
Cherry picked dna editor fix from 99324b76d39fef17316a0e84b08c716570a60acd

umasteeringgroup/UMA,agentc0re/UMA,yjpark/UMA,huika/UMA