Remove alert
Merge branch 'DDBNEXT-482-2' into develop