Merge "Revert "Restore old signature for acquire/release session"" into nyc-dev