Merge branch 'issue#42' into 'dev-v3.5.1'

issue #42 fix tree build issue

See merge request !100