INV-0042

Detail view for INV-0042

Full implementation in follow-up plan.