fix issue with reset while configuring
Merge branch 'master' into fix-reset-option
add small changelog