DIAP-497

Part of DIAP-497