(cherry picked from commit bd12f636c8afbfc22f00342438112fe068551537) Signed-off-by: Andrey Kamaev <andrey.kamaev@itseez.com>
(cherry picked from commit 47b9640785cb0fe4dce043cb676e687e74704276) Signed-off-by: Andrey Kamaev <andrey.kamaev@itseez.com>