Merge pull request #5656 from lateralusX/lateralusX/dynamic-static-windows-build