improve time of matrix gener by 60% and remove completely "noninherited" logic for arp gen
Merge branch 'develop' into 1.x-stable