Merge branches 'fixes' and 'fixes2' into devel-late