DIAP-342

Part of DIAP-342