DIAP-466

Part of DIAP-466