1 Client 640 - 641 changes

by Supanova

2 Host 679 changes

by Supanova