DIAP-055

Part of DIAP-055