integration commit with small bugfixes