DIAP-437

Part of DIAP-437