DIAP-332

Part of DIAP-332