we are changing here a BB component and it  may have impact on all the apps that use it ... 

Maybe that should be done in a separate patch / bug