version 2.6.0 - branch manual export