DIAP-477

Part of DIAP-477