Address various windows issues rebased

Podhorszki, Norbertrequested to merge
github/fork/chuckatkins/address-various-windows-issues-rebased into master

Created by: chuckatkins

Merge request reports