remote: [macros] refactor status to use base stream (DRY)
Merge branch 'refactor/streams'