Merge "Add workaround for handling versionMajor with string type" into main