DIAP-063

Part of DIAP-063