backport changes from V00-23-XX

these changes were back ported from V00-23-XX which we can remove once these changes are included here