Added Vitaly Sedelnik's recommendation.
Added test silencing.
Merge branch 'feature/vaitaly' into develop
Merge branch 'release/vitaly'