Merge "Return correct result" into main