Hi guys
Just got contacted by my service department to notify me they have a fix for the cruise issue. As thought, it's software related and I think they may be replacing the main control module.
Service due in the next couple of weeks so I will let you know if it fixes it.