Reproduce VISCLOUD-502

Reproduce VISCLOUD-502