One more change related to TISTUD-1439.