[FIX] tools: restrict available attributes
[MERGE] forward port of branch 7.0 up to b601015