DIAP-306

Part of DIAP-306