Export option for WBM
Merge branch 'devel' into devel-ci