Merge "Libeffects : Refactor bundle and add missing functionalities"