DIAP-554

Part of DIAP-554