DIAP-566

Part of DIAP-566