Backport from V00-21-XX