DIAP-285

Part of DIAP-285