ISAICP-6782: Fix code after upsteram MR update. Part 2.

2 jobs for ISAICP-7092 in 18 seconds (queued for 20 seconds)