DIAP-272

Part of DIAP-272