DIAP-522

Part of DIAP-522