adding viewing branch structure
Merge branch 'master' into ThreadingRefactorToAutoCleanupOnceComplete