Merge branch 'check' into dev