Merge branch 'improve_specs' into 'volunteer-integration' to

integrate leading edges of volunteer features