Merge branch 'lee-fixes' into devel