make import export configurable2
Merge branch 'master' into 2.5.x