DIAP-473

Part of DIAP-473