[sr-dev] git:master:12414972: core: fix to xavp_rm_internal (#2604)