Fixed exponent in parser #SCL-6784 Fixed
(cherry picked from commit 4828a99)
Fixed compilation in tests
(cherry picked from commit d028aa3)
Merge remote-tracking branch 'origin/master.release' into master.release