Merge "Fixes test in basyx.tck" into release_1.0_java