Merge "Do not commit session twice"