Adapted to run with DM 4.4-SNAPSHOT of today.