p970 and p990
Merge commit '9ad1145' into jellybam-4.2.1