Ported some macroses from linux kernel
Merge branch 'global-defines' into develop
Merge branch 'develop' into xml-ui-integration