Committing code for selftest 9.
Merge origin/master