DIAP-457

Part of DIAP-457