DIAP-422

Part of DIAP-422