Catch exception in case alreaydy enabled.
Merge remote-tracking branch 'origin/master'
2.0-rc2