3.4.0 - 3.4.61

One huge commit :)

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