merge outstanding changes
5 files changed