Merge "reset() should reset. Otherwise it would be called something else. Bug #7256095" into jb-mr1-dev