Merged develop-1_8 onto develop
Fixed tests.
Fixing tests.
Fixing tests.
Fixing tests.
Fixing tests.
Fixing tests.
Fixing tests.
Fixing tests.
Fixing tests.
Fixing tests.
Fixing tests.
Fixing tests.
Fixing tests.
Fixing tests.
Fixing tests.
Fixing tests.
Fixing tests.
Fixed spd tests
Fixed validation tests.