Merge branch 'late/fixes' into fixes