Fix for CDK-109: no attr arp displayed as 'all attr'
Merged master into CDK-108