Merge branch 'dev' into fix/memory-lock-windows-takeover