CCS 5.1.1.00031 "Step Over" doesn't work for MSP430 __delay_cycles intrinsic

When CCS 5.1.1.00031 and MSP430 Compiler V4.0.1 is used to debug programs, found that the "Step Over" operation in the debugger doesn't step over __delay_cycles intrinsic functions. e.g. debugging the following example on a MSP-EXP430FR5739:

#include <msp430.h>

void main(void) {
   // Stop watchdog timer to prevent time out reset
   WDTCTL = WDTPW + WDTHOLD;
   while (1)
   {
     __delay_cycles (100);
     __delay_cycles (1000);
     __delay_cycles (10000);
     __delay_cycles (100000);
     __delay_cycles (1000000);
     __delay_cycles (10000000);
   }
}

If "Step Over" is used to attempt to step the program one source line at a time, then "Single Step" has to be used multiple times to step over a single __delay_cycles intrinsic. Is it possible the CCS debugger could be made to step over the __delay_cycles intrinsic?

(I note that IAR Embedded Workbench Kickstart for MSP430 5.40.3 does Step Over a __delay_cycles intrinsic)