SW-34. Fixing simulation environment after merging.