DIAP-410

Part of DIAP-410