Changes from 08.01. included