INV-0040

Detail view for INV-0040

Full implementation in follow-up plan.