Merge "Adding messages after SAP annotations removal and exporting the package v2 converter"