Merge branch 'dp/checkattr'