DIAP-557

Part of DIAP-557