Catch up from ku-fpg branch

A lot has happened since branching. Time to re-sync.