DIAP-493

Part of DIAP-493