Merge "Bugfix, version negotiation"