DIAP-546

Part of DIAP-546