[ros-diffs] [cwittich] 72634: [CRT] add #ifdef for easier syncing