Backport latest master commits and remove 363361a backport as it causes issues with NFS based recordings access