[ros-diffs] [dquintana] 63175: Sync with trunk r63174. CORE-8176 #resolve #comment Trunk commit r63174 should fix this issue. I merged from trunk to bring it into Shell-experiments.