ticket:9 fix
Merge branch 't9_command' into t10_db_signals