berry-pick: add TODO
berry-pick: fix bug with incorrect msg file path