Merge branch 'features/project-plan-evan' into features/project-plan