[PATCH 10 of 20] Upstream: style