Merge "Handle upgrade and B&R compatibilty"