DIAP-636

Part of DIAP-636