DIAP-485

Part of DIAP-485