Merge branch 'tk/apply-dev-null-verify-name-fix'