Minor trimmed_def_paths
improvements
#119974
Merged
trimmed_def_paths
improvements
#119974