-i now does something (useful :)
remaster -> feature --update --all
shaping it out
Merge branch 'ft/simple-flow-improvements'