IDEX-1469 fix visibility an enabling state
Merge remote-tracking branch 'origin/master'