DIAP-256

Part of DIAP-256