wzc #15

Open
pmg8uxern wants to merge 3 commits from wzc_branch into develop