Merge "Release onboardingapi 2.12.4"