DIAP-474

Part of DIAP-474