DIAP-322

Part of DIAP-322