Hand merge develop into fix/windowsPathFix