Merge "Fix build type is empty in version string" into integration