IDEX-237: remove alert
Merge remote branch