This seems ready to be merged in with master. Things are working