Setting encoder constants after reset added
Merge