Merge branch 'refs/heads/ickby-assembly' into jriegel-dev-assembly
windows: add type specifier