CIC-1034 fix
merge duplicate