TISTUD-6872 Supporting changes.