6 Patches

#376 #377 #378 #379 #380 #382