Apply review over commit 20cdf24d234cbb427ba3c1108d53c0bf68face88
Apply review over commit 20cdf24d234cbb427ba3c1108d53c0bf68face88

vodkina/GlobaLeaks,vodkina/GlobaLeaks,vodkina/GlobaLeaks,vodkina/GlobaLeaks