ITTE-1218 some commit

Signed-off-by: Simeon Iliev <simeon.iliev.bg@gmail.com>