Merge branch 'dev' into fix/8316-windows-inbox-lock-pid-reuse