This would replace @jackson.lee-ext tentative as part of his AUD insertion MR. Tested with1.20.5+.
cc @nas.chung-ext