DIAP-532

Part of DIAP-532