DIAP-460

Part of DIAP-460