DIAP-246

Part of DIAP-246