Added missing value reset
Merge branch '2.0'