pre-resync commit

Commiting prior to re-rebasing.