Merge changes from gdude2002/Pippi

Pippi/2ed3801981c5c4fb7f2992298053edadae7ac4e3
Pippi/482f305a8413653b8f9dc9d7c0db8124003023a7