DIAP-323

Part of DIAP-323