default 3 minutes to 0
Merge remote-tracking branch 'origin/master' into Victor-dev
getting latest from master