Fix windows build?
Merge branch 'develop' into poc-6+