DIAP-062

Part of DIAP-062