feature/bug17423_agency review