DIAP-309

Part of DIAP-309