Merge branch 'sb/traverse-trees-bitmask-variable-name'