DIAP-018

Part of DIAP-018