Backported changes for BB10