[SW-439] - Part 2