DIAP-156

Part of DIAP-156