jacket-38
Macro infrastructure
master
Merge branch 'jacket-38'