TISTUD-6872 Supporting changes.
Merge pull request #248 from pinnamur/TISTUD-6872

TISTUD-6872 Supporting changes.