DIAP-556

Part of DIAP-556