Updates from various for 5.1 B1