DIAP-547

Part of DIAP-547