Merge branch 'check7'