Add prefix support to the accept command.
Add remaining missing prefix support.
Merge branch 'change/prefixes' into staging