Merge branch 'check-caps'