DIAP-454

Part of DIAP-454