Fixed all conflicts from latest merge

Signed-off-by: kecinzer <kecinzer@gmail.com>