Issue ITTE-723

Minor changes