Merge fix for cherry picking to themeup branch
merge fix
merge fix
merge fix