Merge "API feedback: make bubble pref an int def" into sc-dev