merged branch release_06 and use submodules