DocDef for new global components
Merge branch 'diana/DocDefAOTP'