Nishi, Abhi #753 moving container reports to generic report builder