merge changes
fixed missed conflict
Merge branch 'upstream/test' into alegion