Change-Id: I18340c43ff6f79fdadad877369292e7eb4f1b1da
Signed-off-by: Vyacheslav Silchenko <splavs@gmail.com>
Merge branch 'dev' into dev2