BZ-9774 - adding updates for step 5 (381e2b8)