DIAP-613

Part of DIAP-613