Merge branch 'mgiuca-wx-config' into integration