DIAP-507

Part of DIAP-507