Merge branch 'late/cleanup' into devel-late