DIAP-356

Part of DIAP-356