DIAP-545

Part of DIAP-545