update _message_sending_locato locator
Merge remote-tracking branch 'upstream/v1-train' into v1-train