Merge 'agendas_in_home' to 'master' branch