DIAP-463

Part of DIAP-463