Preliminary testing.
Merge branch 'tested' into devel