Fixed conflicts

Signed-off-by: kecinzer <kecinzer@gmail.com>
Merge branch 'nightlies' into test