Merge branch 'fixit25' into fixit23