#604 - update options default value
Merge branch 'master' into 3.4-IP