SNAP-4666
Change