Merge branch 'check18' (with 'check 21')