DIAP-313

Part of DIAP-313