+ integrated patch from Thomas to enable seamless mode