DIAP-426

Part of DIAP-426