Merge "Increment release version for osdf & has" into frankfurt