Trivial de-yellow on nb
Merge with 1.7