Production Scheduling: Calendar Delay Time and Changeover Time Overlap

Hi all

I trust that you are well.

Although I am sure this is not new, I was only made aware of it recently, but would appreciate some help with it.  Essentially, we have some changeover time setup between operation groups, but this time is overlapping with calendar delay time, which can be seen in the screenshot below.

I still need to test but believe it may be that we are not specifying a specific calendar to be used with the changeover time, hence PS is ignoring the calendar assigned to the resource.  Is there anything else that I should be checking?