DIAP-461

Part of DIAP-461