cherry-pick from develop
fix communicator