DIAP-603

Part of DIAP-603