DIAP-067

Part of DIAP-067