merge
Merge branch 'periodic-dev-setup'