DIAP-564

Part of DIAP-564