DIAP-527

Part of DIAP-527