Minor refactoring to add support for TISTUD-4848
refactoring to add support for TISTUD-4785
Merge pull request #75 from pinnamur/4848-stud

TISTUD-4848 and TISTUD-4785 Refactoring in studio3