This is to fix conflicts PR https://github.com/ConservationInternational/cplus-plugin/pull/541 and syncing latest changes to cplus core.