Merge branch 'master' into t10_signals
ticket:10 making fixex according to comments
Merge branch 't10_signals'. Corrected by reviewer's comments.