Imported Upstream version 3.10.2

starting point