Handled 0 number of instances and improved efficiency
Merge branch 'master' of https://github.com/gsdlab/ClaferToolsUICommonPlatform