Merge support for Extended Master Secret (session-hash)