inline expansion of manakai_append_text
auto-merge staging into master