[SR-Dev] git:master: core: Consolidate append_str macro usage