Amanda's PR with merge conflicts resolved