detection of option implement in alert setting
Merge remote-tracking branch 'origin/master'