TISTUD-6307	 Add diagnostic information to investigate the debugging issues
Minor refactoring
Merge pull request #191 from pinnamur/TISTUD-6307

TISTUD-6307	 Add diagnostic information to investigate the debugging iss...