[development] Review request: issue #39697