Merge with replace-stage branch.
expand-list
2017-10-03, Eric Fritz