adding initd export
Merge branch 'master' into enterprise