Fixes: #2595 Removed some duplicated blocks
Fixes: #2898 Adding handling of nameAttr