allow defining of host macros
Merge branch 'host_macros' into integration