fix for TOOLS-2283,2284,2285,2287,2288,2348,2351~

fix for following issues. 
TOOLS-2283
TOOLS-2284
TOOLS-2285
TOOLS-2287
TOOLS-2288
TOOLS-2348
TOOLS-2351