This change should not be hidden in a BlackBerry request, please split it out.