DIAP-406

Part of DIAP-406