Q4 Roundup

Roundup #6

dev update

dev update