Second commmit for IN-007
after merge commit