Merge 'agendas_refactor' to 'master' branch