staging 2.3.4

Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>